Bug Fixed and new Function