yeah, trying to make it more maintainable.