Final modificiations