Incorporates Oliver and Paul's ideas