time is allmost running out, some more changes