Big changes, added figures