some updates to make it run