Returned origininal code and need debug test