Updated without javascript