clean branch + add wrapper