Merged viewport and skill_shots successfully