Work in progress.
more comment change