REVISED CODE