merge with previous version on westpic server