Reordered init functions