Add back intial stuff