Noted some things that need to be added