Changed some stuff in order to be compliant with the new stuff