Fixed Everything so that it works