Tighening up the project