Revised setup