minor stuff
some more steps DO NOT merge
next few steps
modifs