Final additions
Final commit