add better structure
settings