Changed to YAML and switched order