almost final changes :D
resolved conflict