Revised all