Can be removed once the comment above is adressed