Replaced the 3 dots and removed todo