reformatted with Ashlee's changes