removed some things
rewrite