added possible shop solution. needs testing