removing debug, using context