A few more changes but nothing major changed