Refactoring
(Re)Add active function