changes to allow fade