added the rest of main controlles