more updates for poms and assembly