Refactor so all info is given and naming is fix
Same kind of refactor as last commit

Just different file and different intent