re-enabled commented-out items