Where refactored; Todos added;