Added #6 todo