Merging Monkstone's changes