merging after bug fixes