almost final changes