(Small changes, removed junk)