Made some changes

Here are some dynamic modifications i mentioned