Finale added, transitions cleaned up