Added 'active' flag everywhere and flip-flopped default where necessary.