Added fix perspective and some refactor
Solved conflict