Working on final changes