changes from automator transferred to framework