Making some changes more to come soon!