stripped out unneccessary code