some progress on Titan related classes