ticket:92 add new functionality