Improvement of Setup