Reverted merge from animal branch (please clean up the code as we discussed before merging to main zon)