Some changes to make it run on my machine