with bug fixes