Final tweaking

Maybe. Perhaps.