added fields removed dep and added mod code