moving this into debug screen