edited to make new plans clearer