changed back to onModuleLoads
resolved conflicts