Some changes for my new setup