rearrange controllers and rewrite where needed
merge conflicts