Updated with current project