Revised with base for re-write of etal