freaking out a little. Not sure if I like this change or not.