solving some issues.