More work on ENet