Changes to allow for more than two places