Added more setup stuff