ZER - Added some more code