ticket:4 implemented