Added location recording