updated to have no ecb stuff