no unauthorised expcetions anymore
added some garbage, removed unauthorised expceion