Moved specifics to main app