commented out johns section temporarily