Add primary first calls for different monitor types

Add primary first calls for different monitor types #2489