messed with that method a little