Making some changes... Check back later

Thanks