update with bug fix and new design