Added a better array filter