Updated & Cleaned