Working version (P.Skowronski)