Trying to make set-up simpler