Provide a more elegant solution