Update code and requirements
Fix already active bug