some stuff been updated