refactored, its alive