Undo - last round of fixes, works now perfectly
Fix merge error