Re-work code to controller base system