removed rest of the old code