[IMP]location type added
[MERGE] with Paul constraints