some changes due to GWT understanding