added a few other things