important update to conform to WRE :)