Finish off shell version