Finally updated all files in the correct way!