changed the code to civi convention