Changed almost every thing