deleted some redundancy