Some modif from Tai on the jsp