Refactor, make map bigger.