Updated to current project