updated unit controller and static controller