merge loc
update tested up version