added store handling