Simplification; added TODO.