changed it to be generic