add more mordern best practices