Maybe this works better if it's called more often