Added some stuff for implimentation