changed manual setup