Improve speed, check energy stability