ticket:14 Final changes