Fixed Erase to follow jquery style of coding
Fixed Merge Conflicts
Fixed merge conflicts