My new changes hahahaha