Sync App + Controller, minor modification