Seems like it done, some little changes