Performance issue - Simplifying