Added proper controls