+ removed old code
+ fixes