added back in arguments
Some more changes