This should finally contain all necessary changes.