Added smooth camera movement
fixed merge