Updating with better documentation