Here is some updates to main control