changed all the stuffs
final commit, everything should be done