moved a bit around first approach (may break stuff)