Code and stuff to make RPOL better