Made some adjustments. Hope it works