Made some changes

Removed some hard codings, still some to change