working mostly now