Phase 4 update
final version