Make it look less hacky