updated small part of the handling