merged 1 and 2 with Axel