updated all code