Changes for record method