fixes for Nichole