finally a working version :+1: