improved configuration