Added horrendous hack to allow easy entity switching