Updated input stuff