Contact Classic Improvements