Updated

Fix and Update in Function