with XIB and other revisions