changed some setup: