schema update, and r unit update