Reverted to commit 95c373b2adefe178742a6476a827c23877e43739 -- changing strategy