updated manual setup