forgot about more unused lines - commented out