Finishing up
adjusting final code