Efficiency changes; added world modifiers