updated for Titan 0.3.1