clean this up a bit
fix this for s_check