Modified boundary conditions + added output based on shot