Minor adjustements - fully working now