Slight Modification for my lib.