Reverted and applied changes to both files - sorry about the mess