Poor-man angular filtering added