some changes (trying to do all in jsp)