Changes to get it working again