Updated for Transit 1.2