Added Wall detection-- Actually works