Cleaned/updated