To almost identical points now removed from the TODO