remove hack and outline for debug