updated song class