updated with more general info