removed redunancy