Just updated and coded few things