moved to approtiate solutions