Made  several enhancements