Reorder initialization once again