fixxed main shit