added in own file and removed unneeded ones