Changed alot of input methods