Save
Separated files and created more specific methods