adding better structure