more code for 0.8.3.0