half way
bug fix