Trying to fix it so it works better.