Changes from toykraft