Move to a saner approach