Complex version
Resolved conflicts