Made less generic. thanks.