More Functions And Simple Changes