woking on #58 and #20