Added credit for lucasvb, added a few more transitions