UPDATE - solving problems with referencing