added a couple of more callbacks