[IMP] done changes suggested by bst