notes can be deleted now
do some refactoring