Updated init ordering