better parser format
prepare for wall calculations