removed mapping, fixed golf