more setup additions