Updated with final changes