Getting correct results now