Added code for 4.6