merged register controller with some uncommitted changes from production server