some modiff to the code