updates for appstore
merge