Added couple of TO-DOs