First set of changes for Gen-art review