Restored things that were removed accidentally from the previous merged