changes and additions for 4.0.5