Further design improvements