added some wrappers. need rework(introduce new parameter)