Here uploading my patch.
pls review it