Add location info, more recent hacks