reworked
removed stuff