Removed a couple defines by adding in additional functions