Performance: solution added