Holy fish I've improved