added elegant solution to the mix