Some changes to controller and the window to accomadate rounds