Added some inputs.. to be continued.