Some good changes :)

Some good changes