Updated and finally included in a live project