Changed the way I use includes