Try to make more minimal