prh fix and improve 2 stable