fixing bags, adding changes