Work in progress - two separate modes (generic VS proper cors)