updated because frankie yelled at me