more appropriate names, some notes