Fixing randy's mess up