Re-enable shop psudeo-levels and add safer skip