UPDATED SMALL CHANGES