Continued updates to address #25