Cleaned up Vidi. Assed session features