Added my changes for 0.23c