fixed typo and added active functionality