almost done weitd stuff changed