template changed and working on joining