added needed comment and todo