Some notes what I need to add