added conditional store