Re-added things that were removed for merging