Changed Input to better system