reorganising code
reorganising code