removing cruft and changed param to be seperate from entry