Removed dublication of two functions after merge