Small changes to make it work