Removed all borders and switched to difractal.entity