materialization logic changes
merge changes