progress
bug fix