Temp fix/automask

Soon to be refactored