Reverted to previous state where things were working