Title: Extensions and Improvements