Modified for 1.3 release