added kadira support