removed redudants for real this time