Various Additions
Update