Hmmm, seems I'll have to merge with these changes.