added working currente version