Some serious additions