some changed by  me