changed to standard todo instead of maria's