Feature/last active field