Final Commit

now it works