Add before filter and walls