change perspective
merge fix