Final changes
Final commit with merge