Frankthetank

here are the changes.