* Modified the Compilation logic