general update
working on replace reference