Singularity less laggy by me.

Applying cloroxygen changes later.