Some changes, and setup is added