yeah, think that would be cleaner