More setup for X