merge commit with some additional functions...