adding in conditional api
removing log