Generate boundaries earlier