removed stuff that should not be committed
new version