Performance has been improved, style improvements