Refresh

Simplified and minimal change to the core project done by Eddie Machado