Work on non-fly and inventory