updated to conventions RC3