few logic changes.