Add Wall option and remove warning