updated version with exaust