Added shit
fixed merge