Mari0 '85 redux

by GRABREIL_MORENO-777 @GRABREIL_MORENO-777