brought in changes for 2.0.4