Final changes to initial deploy