Added some forward-thinking Mugic stuff