rebuilt with bug fixes