Different updates

Need to check everything!!!