Few updates, still need practical test