fixing for faster Setup