added genmap changes from class