Some changes to be able to run from 0