Setup is a little bit neater now