Worked on Edge, Sol and added output commands