Refactored fronted