Updates to work with last_play