Updated working project