updated definitions