Updtaed methods and left TODO notes