fixing initial stuff