Changed poi generation