Final changes for initial build