updated with move changes to filtering etc