Merging in Abmar's changes