Version 3 - some improvements