Code completed
Final changes