IDE swap
Callback from shop, general improvements