moved some methods, added notes