merging biemonds changes