Added fade/trim support