Changed to modular version
Resolved coflicst