Moved several function to penlight equivalents