merged Felix' code