Local set up ammended