update to get function (90% finished)