Altered plan a little