Finishing the code