updated EVERYTHING