upgraded to support 1.3