Updated Land Logic, and added user override