Updated version to pre3.21