Improve pre blocks