version 1.2 - files tested and working