Rewrite of upay