Reversed some Changes from Bills last commit