Moved things, adjusted to check for string name