Stefan changes and todos