Finally found a decent solution