[master] additional features