updates for code merge