Added minor functionality

Minor changes