last version from video night
integrated with roberts version