adding almost final changes