adding zara & cleaning up