Review

a lot of code changed
android studio behaved weirdly and I switched to IDEA, which doesn't support newer version