Removed play, fixed some bugs
Return correct entry