updates to get it working again