updated contools mostly