I think its time to expand the boundaries or get rid of them. Unless this is going to turn into a dark storyline