This function is currently Under Construction and was updated