#9 Removed unneeded parameters