almost finish to my own site