refractored stuff
to delete