Changes for convenient view 2