form2 upgrade, shop refactoring
up