MajorFIX reclassing; margin resizing