updated general setup