Final

Updated comments