modifications for 0.6.3.2