Added parameters to some functions