added some transitions/fades
merged