Trying to fix my old mistakes