Updated for mandatory notation