Small changes to get it working