Merging in views2...finally