Moving some statements around