finished some revision with Nana's comments