Fixed Everything For public Release