temp version until we fix some issues