Added more final code