rolled out options hash and removed unnecessary parameters