Fixed Nadav's changes