updated with latest changes to rygr