new code fixing