Renamed function and added more information