Better code heah