Updated version and TODO