trying to optimize transitions further