added more functionaity