-removed temp fixes