Merged in changes from Marcus