fixed the ? & debocle