corrected output space adding
plenty of new stuff :)

Change-Id: I89bcc2ab3376faeff3df59aa3979e7e7528feabc