added handling for pit, water and fire