changed a lot, added new genre