updated to make thing work