i give up i'm restarting with master branch