updated with more data, fixes