merged codes with raph's