Removed todo, i already implemented this