Try fixing again, add more fields to song