Accommodations

>>>>>>> Stashed changes