Updates to get things working