Final Commit pre-Atish code