moved solution out