it's woking now

it's not perfect but it's working