Maint/master/pe 635 refactor big cats