Performance and design improvement