Updating: tidying up.
Updating: properly handling tyresin.