updated definitions from Alyssa