try new changes to improvement performance
continue pruning warnings