Merged forgotten changes