Change to make Bug Fixes like the earlier versions