Removed bottle requirement; Changed filename output