Yesterday
merge from building_los_fix