Revised definitions