started working on swap 3