This structure makes more sence