Changed planning slightly