Updates to rubified version