Updated input and outputs