start to work on replacing references