Added more functilnality