Existing code (just indented it). Seems valid, but I'd rather touch as little of the ab code as possible