last code fixing