Final code adjustments