or maybe split it in 2 separate methods