Added containers and fixed time bug.