before 3.5 commmit