added more fuctionality