Fixed, checked and updated