first working version with new property file