Rearranged default supervsor code