Added fucaitionalty and changed to make it easer

to code