added some functionality to please austin