IMPROVEMENT: state and name added