modified common.libbun