bit better transitions, not done yet