fixed it to make it generic