pushed final changes hopefully