changed to fallback by else
removed emptyline