Moved some parameters around to accomodate new itemmap method