Some more updates after testing