Sort out internal conflict here