major update, includes all basic transitions