Working much better now.
Fix conflict