Modifying the inputs and main functions