A little more info and things to add