Made changes to Location. Fixed one side of cascade problem