bug fix and see more functionality