Changed some thngs made it easier