updates on shop #21