changed a little code