trying to clean this up