made it semi-working!!!