Added some more functinality