added 2 things TODO