Mike's Last commit before merge with besard code