Update from Herbert
Updated Script