added corelocation
merged conflicts