Dilan dev

Please pull these changes