woking on fixinf issues