Modifications for 0.23