maps masking, needs fixing