merged changes in View.java