Changed to simple servlet