updating so its not so generic.