Took out unnecessary parameters