stage 1 fix
improvements 2