Adapted to HAPP