fixie
hihi refactoring