merge update-1 into design