Smth fixed
Done changes