More aesthetic work on certain states