updated for upcoming 1.3 release