version two - multiple fixes and changes