updated version with paul irish version