Updated version without http request
Updated version without http request