added new function
solved conflict