Updated the feature after better testing