Added editLocation checking