made some changes to define