Working edition

Made Changes that lead to a working result