Some changes on swirl file