Initial work on updated function variables