I would prefer to clean this up