Final changes after 18-hour work