fixedthe rst problems