added more changes to servlet