Adding more adjusts as per zanuz comments