Updated inside of contructor, deleted some controls.