Again uploaded code as there were merge errors.