Added in further functionality