Next grand modifications but not ready yet
Some stuff updated