Adapted to new projects