cleaned up transition