*** removed swap dependency