API changes, indentation problems hopefully solved