locao commit 3/18