added somemore functionality