better structure
add a couple more in