+Added some extra functinality