Adding function and constructors
Correcting conflicts