few changes due to primo version 4.6