implement additional tasks of pr13