Fixed Todo 1 and 2