Forked and adapted to RANDY standard pom