More work on ejecting