Nicer I think
Revert "Nicer I think"

This reverts commit 29b4a5ef8cad159057e24ee2b93611991c193c7c.
Revert "Revert "Nicer I think""

This reverts commit 91fbb832a6ecfd8ce40e39d53fbfc12a07e08c49.