Added return symbols, needs debugging