Revised init