Renewed some code