updated with new info! :)