deleted some redunancies