updated to conventions 1.0.1