added exception, rename variable