finally updates to get things working