Software goaltodos added