Implemented a couple more callbacks