Moved definitions into a single definition