[!COMMIT] Modifications