loc added
Merge Loc3 branch