warnings addressed, removed 15 item limit