Updated to latest shop