Added two orders for movements
Added new filters and new functions on helper